Luckson

@S4INT25

Refactoring